Include glib/gi18n-lib.h and only define the P_() macros ourselves.

2004-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkintl.h: Include glib/gi18n-lib.h and only define
	the P_() macros ourselves.

diff --git a/ChangeLog b/ChangeLog
index 514ae5d9600278be545862635755e8b73af847f9..f50fab73b89b190b5efdca1b8674d182cbe60f6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define
+       the P_() macros ourselves.
+
        * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): 
        Restrict the width of the popup to be no larger than the
        monitor.  (#142678, DmD Ljungmark)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 514ae5d9600278be545862635755e8b73af847f9..f50fab73b89b190b5efdca1b8674d182cbe60f6a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define
+       the P_() macros ourselves.
+
        * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): 
        Restrict the width of the popup to be no larger than the
        monitor.  (#142678, DmD Ljungmark)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 514ae5d9600278be545862635755e8b73af847f9..f50fab73b89b190b5efdca1b8674d182cbe60f6a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define
+       the P_() macros ourselves.
+
        * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): 
        Restrict the width of the popup to be no larger than the
        monitor.  (#142678, DmD Ljungmark)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 514ae5d9600278be545862635755e8b73af847f9..f50fab73b89b190b5efdca1b8674d182cbe60f6a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define
+       the P_() macros ourselves.
+
        * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): 
        Restrict the width of the popup to be no larger than the
        monitor.  (#142678, DmD Ljungmark)

diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h
index 9f66ec1e7fd613410d7a3f00bcad080ecd9f0b84..d29723bb9272bf5568599dd5aafce2dea299c616 100644 (file)
--- a/gtk/gtkintl.h
+++ b/gtk/gtkintl.h
@@ -2,28 +2,12 @@
 #define __GTKINTL_H__
 
 #include "config.h"
-#include <glib.h>
+#include <glib/gi18n-lib.h>
 
 #ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(GETTEXT_PACKAGE,String)
 #define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
-#define Q_(String) g_strip_context ((String), gettext (String))
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#else /* NLS is disabled */
-#define _(String) (String)
+#else 
 #define P_(String) (String)
-#define N_(String) (String)
-#define Q_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
 #endif
 
 #endif